Auto merge of #2297 - alexcrichton:update, r=alexcrichton

Just a routine for niche bug fixes, linkage errors, perf improvements, etc.

Closes #2295

diff --cc Cargo.lock
Simple merge

diff --cc Cargo.toml
Simple merge

diff --cc src/bin/cargo.rs
Simple merge

diff --cc tests/tests.rs
Simple merge